From 84360e022535887621254b397657fcc8f40750f1 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 25 Jan 2001 15:37:21 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41e1ac763d4..92f174e790d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2001-01-25  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* smerge-mode.el (smerge-font-lock-keywords): Relax submatch 1.
+
 	* emacs-lisp/easy-mmode.el (define-minor-mode): Docstring fix.
 
 2001-01-25  Dave Love  <fx@gnu.org>
-- 
2.30.2